From: Ray Strode <rstrode@redhat.com>
Date: Wed, 14 Jun 2017 20:41:41 +0000 (-0400)
Subject: objectManager: handle object manager sending empty array
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~291
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9c4e875de440b1b60a6723d17daafcfceaa137f2;p=gnome-shell.git

objectManager: handle object manager sending empty array

If the service implementing the object manager returns
a 0 length array we currently throw an exception.

This commit fixes that.

https://bugzilla.gnome.org/show_bug.cgi?id=780403
---

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 225204347..c86e47ab4 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -193,6 +193,11 @@ const ObjectManager = new Lang.Class({
 
             let [objects] = result;
 
+            if (!objects) {
+                this._tryToCompleteLoad();
+                return;
+            }
+
             let objectPaths = Object.keys(objects);
             for (let i = 0; i < objectPaths.length; i++) {
                 let objectPath = objectPaths[i];